css: Leftover renaming gtk-image-effect => icon-effect

The previous renaming commit was incomplete, so here we go again.

diff --git a/gtk/deprecated/gtkiconfactory.c b/gtk/deprecated/gtkiconfactory.c
index 690b20872494c862248a0ea47712025089d38ccb..1508da583aec43c530b4a436a50705b15d410649 100644 (file)
--- a/gtk/deprecated/gtkiconfactory.c
+++ b/gtk/deprecated/gtkiconfactory.c
@@ -1443,7 +1443,7 @@ G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
 G_GNUC_END_IGNORE_DEPRECATIONS;
 
   effect = _gtk_css_icon_effect_value_get
-    (_gtk_style_context_peek_property (context, GTK_CSS_PROPERTY_GTK_IMAGE_EFFECT));
+    (_gtk_style_context_peek_property (context, GTK_CSS_PROPERTY_ICON_EFFECT));
 
   switch (effect)
     {

diff --git a/gtk/gtkcssenumvalue.c b/gtk/gtkcssenumvalue.c
index 1f356a30adcc5c7e8a8a9e3de3a2f46a722e2c64..c606f0bffd090596ec47df760e440635b2b7ec16 100644 (file)
--- a/gtk/gtkcssenumvalue.c
+++ b/gtk/gtkcssenumvalue.c
@@ -871,7 +871,7 @@ _gtk_css_fill_mode_value_get (const GtkCssValue *value)
 
 /* GtkCssIconEffect */
 
-static const GtkCssValueClass GTK_CSS_VALUE_IMAGE_EFFECT = {
+static const GtkCssValueClass GTK_CSS_VALUE_ICON_EFFECT = {
   gtk_css_value_enum_free,
   gtk_css_value_enum_compute,
   gtk_css_value_enum_equal,
@@ -880,9 +880,9 @@ static const GtkCssValueClass GTK_CSS_VALUE_IMAGE_EFFECT = {
 };
 
 static GtkCssValue image_effect_values[] = {
-  { &GTK_CSS_VALUE_IMAGE_EFFECT, 1, GTK_CSS_ICON_EFFECT_NONE, "none" },
-  { &GTK_CSS_VALUE_IMAGE_EFFECT, 1, GTK_CSS_ICON_EFFECT_HIGHLIGHT, "highlight" },
-  { &GTK_CSS_VALUE_IMAGE_EFFECT, 1, GTK_CSS_ICON_EFFECT_DIM, "dim" }
+  { &GTK_CSS_VALUE_ICON_EFFECT, 1, GTK_CSS_ICON_EFFECT_NONE, "none" },
+  { &GTK_CSS_VALUE_ICON_EFFECT, 1, GTK_CSS_ICON_EFFECT_HIGHLIGHT, "highlight" },
+  { &GTK_CSS_VALUE_ICON_EFFECT, 1, GTK_CSS_ICON_EFFECT_DIM, "dim" }
 };
 
 GtkCssValue *
@@ -918,7 +918,7 @@ _gtk_css_icon_effect_value_try_parse (GtkCssParser *parser)
 GtkCssIconEffect
 _gtk_css_icon_effect_value_get (const GtkCssValue *value)
 {
-  g_return_val_if_fail (value->class == &GTK_CSS_VALUE_IMAGE_EFFECT, GTK_CSS_ICON_EFFECT_NONE);
+  g_return_val_if_fail (value->class == &GTK_CSS_VALUE_ICON_EFFECT, GTK_CSS_ICON_EFFECT_NONE);
 
   return value->value;
 }

diff --git a/gtk/gtkcssstylepropertyimpl.c b/gtk/gtkcssstylepropertyimpl.c
index 60030817ebb92bff8712f67a6ac9e617bebe2f8b..2b9c51da66b2bffd266984ff5e34f5c528a3fa8f 100644 (file)
--- a/gtk/gtkcssstylepropertyimpl.c
+++ b/gtk/gtkcssstylepropertyimpl.c
@@ -1727,7 +1727,7 @@ _gtk_css_style_property_init_properties (void)
                                           NULL,
                                           _gtk_css_number_value_new (1, GTK_CSS_NUMBER));
   gtk_css_style_property_register        ("-gtk-icon-effect",
-                                         GTK_CSS_PROPERTY_GTK_IMAGE_EFFECT,
+                                         GTK_CSS_PROPERTY_ICON_EFFECT,
                                          G_TYPE_NONE,
                                          GTK_STYLE_PROPERTY_INHERIT,
                                           GTK_CSS_AFFECTS_ICON,

diff --git a/gtk/gtkcsstypesprivate.h b/gtk/gtkcsstypesprivate.h
index 692bea9110926fcedad81a9888edd8a64a7ec30c..0bd818fa3c668ed8e47f1f97d9e063559a4fc05c 100644 (file)
--- a/gtk/gtkcsstypesprivate.h
+++ b/gtk/gtkcsstypesprivate.h
@@ -216,7 +216,7 @@ enum { /*< skip >*/
   GTK_CSS_PROPERTY_ANIMATION_DELAY,
   GTK_CSS_PROPERTY_ANIMATION_FILL_MODE,
   GTK_CSS_PROPERTY_OPACITY,
-  GTK_CSS_PROPERTY_GTK_IMAGE_EFFECT,
+  GTK_CSS_PROPERTY_ICON_EFFECT,
   GTK_CSS_PROPERTY_ICON_PALETTE,
   GTK_CSS_PROPERTY_ENGINE,
   GTK_CSS_PROPERTY_GTK_KEY_BINDINGS,

diff --git a/gtk/gtkrender.c b/gtk/gtkrender.c
index 27b253d7b329caea3225b5c444f051f0233a62c4..1f44b2e401d525e629da58837142602ecb7f1e16 100644 (file)
--- a/gtk/gtkrender.c
+++ b/gtk/gtkrender.c
@@ -1091,7 +1091,7 @@ gtk_render_icon_pixbuf_for_style (GtkCssStyle         *style,
   if (!wildcarded)
     return scaled;
 
-  icon_effect = _gtk_css_icon_effect_value_get (gtk_css_style_get_value (style, GTK_CSS_PROPERTY_GTK_IMAGE_EFFECT));
+  icon_effect = _gtk_css_icon_effect_value_get (gtk_css_style_get_value (style, GTK_CSS_PROPERTY_ICON_EFFECT));
 
   if (icon_effect != GTK_CSS_ICON_EFFECT_NONE)
     {